Use /translations for Mac and Windows.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4094 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 139a23393bfac99b0772c9828468de2ae955fdaf..b29ea0a526c0e5732c1ad69cbef4424bacca1e1f 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -347,13 +347,13 @@ mac-release:
 
 
 mac-gui: gpsbabel
-       file gpsbabel | grep '2 architectures' || exit 1
-       file gui/objects/GPSBabelFE.app/Contents/MacOS/GPSBabelFE | grep '2 architectures' || exit 1
-       cd gui ; qmake && xcodebuild
+       # file gpsbabel | grep '2 architectures' || exit 1
+       # file gui/objects/GPSBabelFE.app/Contents/MacOS/GPSBabelFE | grep '2 architectures' || exit 1
+       cd gui ; qmake && make
        cd gui ; lupdate  app.pro
        cd gui ; lrelease  app.pro
-       mkdir gui/objects/GPSBabelFE.app/Contents/MacOS/lang
-       cp gui/*.qm  gui/objects/gpsbabelFE.app/Contents/MacOS/lang
+       mkdir gui/objects/GPSBabelFE.app/Contents/MacOS/translations
+       cp gui/*.qm  gui/objects/gpsbabelFE.app/Contents/MacOS/translations
        cp gpsbabel gui/objects/GPSBabelFE.app/Contents/MacOS
        cp -r gui/help  gui/objects/GPSBabelFE.app/Contents/MacOS
        cp gui/gmapbase.html gui/objects/GPSBabelFE.app/Contents/MacOS

diff --git a/gpsbabel/gui/mainwindow.cpp b/gpsbabel/gui/mainwindow.cpp
index 4cb1bc05c7d63de4c285ce760f891bbdfb6aef56..668bd7539b54850013084dac2bda3cb6c61a44f6 100644 (file)
--- a/gpsbabel/gui/mainwindow.cpp
+++ b/gpsbabel/gui/mainwindow.cpp
@@ -205,9 +205,8 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
   ui.outputWindow->setReadOnly(true);
 
   langPath = QApplication::applicationDirPath();
-#if defined (Q_OS_WIN)
   langPath.append("/translations/");
-#endif
+
   // Start up in the current system language.
   loadLanguage(QLocale::system().name());
   createLanguageMenu();